From: Glenn Morris Date: Sat, 15 Jan 2011 20:42:23 +0000 (-0800) Subject: bzrmerge.el trivia. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5190 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c9ab9d3b87fdf6147d8d52c975fc67984f456f4a;p=emacs.git bzrmerge.el trivia. * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el. --- diff --git a/admin/ChangeLog b/admin/ChangeLog index 5807863a910..0fdd0967892 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-01-15 Glenn Morris + + * bzrmerge.el (bzrmerge-missing): Add another skip indicator. + (bzrmerge-resolve): Also ignore cl-loaddefs.el. + 2011-01-14 Glenn Morris * admin.el (set-copyright): Also handle \year in refcards/*.tex. diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index ca10d2a87a2..6764cbf853a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -115,7 +115,7 @@ are both lists of revnos, in oldest-first order." (re-search-forward "^message:\n") (while (and (not skip) (re-search-forward - "back[- ]?port\\|merge\\|re-?generate\\|bump version" nil t)) + "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t)) (let ((str (buffer-substring (line-beginning-position) (line-end-position)))) (when (string-match "\\` *" str) @@ -173,7 +173,8 @@ are both lists of revnos, in oldest-first order." )) ;; Try to resolve the conflicts. (cond - ((member file '("configure" "lisp/ldefs-boot.el")) + ((member file '("configure" "lisp/ldefs-boot.el" + "lisp/emacs-lisp/cl-loaddefs.el")) (call-process "bzr" nil t nil "revert" file) (revert-buffer nil 'noconfirm)) (t